resolve conflicts: #24561 fix(txe): align tagging strategy oracle with PXE#24877
Open
PhilWindle wants to merge 1 commit into
Open
resolve conflicts: #24561 fix(txe): align tagging strategy oracle with PXE#24877PhilWindle wants to merge 1 commit into
PhilWindle wants to merge 1 commit into
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Automated conflict-resolution attempt for #24856 (
fwd-port-24561). Merges next + v5-next PR #24561.Resolution
Single conflict in
docs/docs-developers/docs/resources/migration_notes.md. next had promoted the old## TBDentries into versioned## 5.0.1/## 5.0.0sections; the incoming side of the conflict was empty. PR #24561's migration note ([Aztec.nr] TestEnvironmentOptions::with_tagging_secret_strategy replaced) was already present as post-conflict common content, grouped with the other Aztec.nr## 5.0.0notes.Resolved as a UNION: kept next's
## 5.0.1/## 5.0.0sections and preserved PR #24561's note. Only the three conflict-marker lines were removed; no prose was dropped from either side.Confidence: high. This is a docs-only, additive conflict with no generated artifacts involved and no code logic to reconcile. Reviewer may wish to confirm the placement of the TestEnvironmentOptions note under
## 5.0.0is acceptable versus## TBD.